Merge branch 'develop'
don't write PHP Strict Standards error messages to debug.log
Merge branch 'master' of github.com:mlaa/commons
Merge branch 'master' into develop