Fixed Uploading files and Google Docs

This is currently hot-fixed on live, and this branch contains the changes that were made.  Addresses issues #1529 and #1530