fix #2034
Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x