Merge remote-tracking branch 'upstream/master' into patch-3

Conflicts:
	spec/php-spec-draft.md

Author: mauro-moreno