PHP 5.4 Strict Standards
Merge branch 'master' into develop