Merge branch 'pull-request/341'

* pull-request/341: (23 commits)
  typofixes
Merge branch 'pull-request/341'

* pull-request/341: (23 commits)
  typofixes
Merge branch 'PHP-5.5'

* PHP-5.5:
  Merge branch 'pull-request/341'
  Merge branch 'pull-request/341'