Merge branch 'master' into SubMaster-1

Conflicts:
bin/HingedPiston/common/BlockHingedPiston.class
bin/HingedPiston/common/HingedPiston.class
mods/HingedPiston/common/BlockHingedPiston.java