By: Michael Lynch <git@mtlynch.io>
Merge branch 'master' into slice-1 # Conflicts: # convert/images.go