Merge branch 'wolfsage-topic/rt-113486-utf8-named-file-uploads'
John Napiorkowski [Mon, 4 Apr 2016 16:55:24 +0000 (11:55 -0500)]

Trivial merge