Fix for Mumble-SA-2014-001 and Mumble-SA-2014-002
Merge branch 'mumble-sa'