Also test with PHP 5.5 on Travis CI
Merge branch '1.2' into 1.3
Fix dependency