Fix bug #61981
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #61981
Fixed bug #61981
more test coverage: missing square bracket error message
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  more test coverage: missing square bracket error message
  Fixed bug #61981
merge with 5.4