Merge branch 'pull-request/341'

* pull-request/341: (23 commits)
  typofixes
fix double entry
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix double entry
  Merge branch 'pull-request/341'