Also test with PHP 5.3.3 on Travis CI
Merge branch '1.2' into 1.3
Merge branch '1.3'