Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Fix php config example for hinclude_default_template

Author: javiereguiluz