Fixed a case where certain characters (like #) weren't being escaped properly. Whoopsie!
Merge branch 'master' into production