add upstream changes, put options in order of master
Merge branch 'experimental/php' into refs/top-bases/experimental/marc

* experimental/php:
  add upstream changes, put options in order of master
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc

* commit 'refs/top-bases/experimental/marc':
  add upstream changes, put options in order of master