Merge branch 'master' into develop
Add a parameter for the ability to bypass email hijacking global setting.
Merge branch 'develop'