GC changes
Merge branch 'master' of github.com:MCForge/MCForge7-Vanilla