Keep the original file extension when uploading a file.

MERGE ME AFTER THE APP BRANCH