MC 1.7.10 support
Merge remote-tracking branch 'origin/master'