Fix a bug that caused has_many fields to be lost
Merge pull request #3059 from jgorset/master

Fix a bug that caused has_many fields to be lost