Merge branch 'master' into int_overflow

Conflicts:
	spec/php-spec-draft.md