Merge branch 'hotfix-1.4.5' into dev
Make it possible to use php 5.3
hotfix 1.4.6
Merge branch 'hotfix-1.4.6'