re #835 - Search for dash and underscore in regex
Merge branch 'feature/835-mailto' into staging