Update1.5.2
Merge branch 'master' into dejiplus-152
Merge branch 'dejiplus-152'

Conflicts:
	src/main/java/net/minecraft/server/PlayerConnection.java