Command line uploads should not be subject to the same restraints as the front end
Merge remote-tracking branch 'origin/cake-2.0' into cake-2.0