marchant Merge pull request #1994 from marchant/fixes-model-constructor-name …