Merge remote-tracking branch 'weierophinney/hotfix/beta5-escaper'
authorRob Allen <rob@akrabat.com>
Thu, 5 Jul 2012 21:35:21 +0000 (22:35 +0100)
committerRob Allen <rob@akrabat.com>
Thu, 5 Jul 2012 21:35:21 +0000 (22:35 +0100)

Trivial merge