Merge remote-tracking branch 'weierophinney/hotfix/beta5-escaper'