Merge branch 'hotfix/0.4.6.1'
Reducing stupidity (and also removing a handy PHP 5.4 feature)
Merge branch 'hotfix/0.4.6.2' into develop