Wildcards should only be used in the first name component; fixed comment style
Merge branch 'PHP-5.6'

* PHP-5.6:
  Wildcards should only be used in the first name component; fixed comment style