Additional PHP 5.3 bugfixes
Merge branch 'release/0.3.4'