RegEx changed
Merge branch 'master' into Frodo