Fixed: move PHP 5.3.3 workaround to the right place
Merge branch 'master' into EZP-19884