https://www.pivotaltracker.com/story/show/48583417
Merge branch 'dev_upload_error_48583417' into develop