changing media handler to get round nginx issue
Merge remote-tracking branch 'upstream/master'
fixing media upload tweak
Merge remote-tracking branch 'upstream/master'