Merge branch 'hotfix/v1.2.1_SP2013-BindConverter'
Security Module added
Merge branch 'hotfix/v1.2.1_SP2013-Security' into develop