Minecraft 1.6 (1.6.2) - merging back to master branch