Fixed the PHP-1099 test, so that it has a bit more time before the timeout happens.
Merged pull request #712
Merge branch 'v1.5'
BUMP 1.5.3
Back to -dev.
Merge branch 'v1.5'