Minecraft 1.7 (1.7.2) - merging to master