By: Michael Lynch <git@mtlynch.io>
Merge remote-tracking branch 'origin/r-w-naming' into slice-2.5 # Conflicts: # uploads/processor.go