Register your tile entities people!  Minecraft will hate me for a bit!
Merge remote-tracking branch 'origin/master'