BUGFIX escaping backslashes (regexp)
Merge branch 'master' into gh-pages