Fix name in PHP-1220 test case
Merge pull request #747
Merge branch 'v1.5'