Merge remote-tracking branch 'upstream/master' into autoship-edit

Conflicts:
	phpunit.xml