Update CODING_STANDARDS
Update CODING_STANDARDS
Merge branch 'pull-request/811'

* pull-request/811:
  Update CODING_STANDARDS
Merge branch 'PHP-5.6'

* PHP-5.6:
  Update CODING_STANDARDS