Merge pull request #2922 from daviddavis/temp/20130911082735

Content Uploads: Working on feedback from pull request