Fix indentation
Merge branch 'PHP-5.5' into PHP-5.6
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport

* origin/PHP-5.6:
  Fix indentation