Fix so that multiple hasOne with the same model can be included
Merge remote-tracking branch 'remotes/origin/fix_multiple_hasone'