Merge branch 'melmothx-invalid-get-param-unicode' into unicode-exception-issue
John Napiorkowski [Mon, 18 Jul 2016 21:00:43 +0000 (16:00 -0500)]

Trivial merge