This is testcase for PHP-1084 not PHP-1085
Merge remote-tracking branch 'upstream/v1.5'

* upstream/v1.5:
  This is testcase for PHP-1084 not PHP-1085