Models changes for previous commit. Sorry Hunter.
Cross-committted against Hunter.
Merge branch 'master' of https://github.com/bethlakshmi/GBE2