simplify the metadata part
Merge branch 'PHP-5.6'

* PHP-5.6:
  simplify the metadata part