Added tests for bug 67436
Merge branch 'pull-request/695' into PHP-5.4