Fix: Bug with php 5.4
Fix: bug with php 5.4
Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	test/phpunit/PdfDocTest.php