Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/XO/Service/PlayerRegistry.php