Fix $needsOp in PHP-1065 test
Merge pull request #680
Merge branch 'v1.5'