This will PHP 5.3.25
Merge branch 'PHP-5.3' into PHP-5.4
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'
Attempt to fix SKIP
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'
Fix Bug #64545:	PHP Error in ef93a93ee21bce9218188

Test was using die "Foo" instead of die("Foo").
Merge branch 'PHP-5.5'
Fix tests after addition of ^ (xor) operator to ini
Merge branch 'PHP-5.5'
Exclude Travis build for 5.3 and 5.4
Merge branch 'PHP-5.3' into PHP-5.4
Forgot to fix the test on 5.4
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	.travis.yml
Merge branch 'PHP-5.5'
Fix SOAP test

Doesn't look like these warnings are present anymore.
Merge branch 'PHP-5.5'
Fix whitespace issue in the SOAP test
Merge branch 'PHP-5.5'