more fixes related to bug #65715
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  more fixes related to bug #65715