Merge branch 'belongs_to_fix' into develop
Merge branch 'superclass_delegating_primary_key' into develop