By: Michael Lynch <git@mtlynch.io>
Merge remote-tracking branch 'origin/master' into fewer-uint32 # Conflicts: # uploads/photo.go # uploads/processor.go