Merge branch 'PHP-5.6' into PHP-7.0

diff --cc .gitignore
index a00615f96678ef14659dd23aae51aef9c1b8f7b2,1ce1eabfe986161764bc794d8cf2cfd391be2296..c427f0da64af76af9369b0432df9b5497060d293
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -140,14 -133,9 +140,15 @@@ tests/*/*/*.s
  */tests/*/*.exp
  */tests/*/*.log
  */tests/*/*.sh
 +*/tests/*/*/*.diff
 +*/tests/*/*/*.out
 +*/tests/*/*/*.php
 +*/tests/*/*/*.exp
 +*/tests/*/*/*.log
 +*/tests/*/*/*.sh
  */*/tests/*.diff
  */*/tests/*.out
+ */*/tests/*.out.png
  */*/tests/*.php
  */*/tests/*.exp
  */*/tests/*.log