Merge branch 'hotfix/v1.2.1_SP2013-Security'
removed internal to security constants
Merge branch 'master' into develop