Updated 1.7.2 branch with latest fixes from master. Fixes #1510

Applied the following commits from master

MinecraftPortCentral/Cauldron@695b775785889d6def933b5bc8baafe0c145d567
MinecraftPortCentral/Cauldron@a6180c586f53f1979615dddb954416cf97de6475
MinecraftPortCentral/Cauldron@d8cb72ca6c8c53a6bdbd9707a353bf27bcf757b2
MinecraftPortCentral/Cauldron@36ef614114cd33c8bfb9cb4bc5fa538dbf239108
MinecraftPortCentral/Cauldron@48c6a81e5c930d869621d933aacdfcf2b5e71f51