Backport to 1.7.2

Waiting on MinecraftForge/ForgeGradle#145 to build