Merge branch 'master' into develop

* master:
escaped regex
Merge branch 'master' of github.com:saltops/saltmine

* 'master' of github.com:saltops/saltmine: