Bugs and naming changes in security.php
Merge branch 'develop'