Patch v1.2.7 with content_type fix

@steved555 It appears we need to patch v1.2.7 with @vkmita's fix for content_type on uploaded files.

I'm not sure about the process for this but this branch contains the 2 commits needed. Let me know if you need me to do anything special here