Might be useful
Merge branch 'master' into 1.7.2

Conflicts:
	src/main/java/openmods/fakeplayer/FakePlayerPool.java