gaffa 1.10 compatibility
Merge branch 'master' of github.com:KoryNunn/gaffa-model-change
1.1.0