Merged Forestry to 1.7 official branch