update version output
Merge branch 'PHP-5.6'

* PHP-5.6:
  update version output
Merge remote-tracking branch 'origin/master' into str_size_and_int64