Merge branch 'refs/heads/master' into gideon

* refs/heads/master:
  Re-add PhpLib
  Delete PhpLib submodule (to fix a problem)
Disable internal ACF (temp fix?)
Merge branch 'refs/heads/gideon'

* refs/heads/gideon:
  Disable internal ACF (temp fix?)