Something changed i guess
Fix for Issue 386

This change fixes two issues I have encountered, one is that of issue
#386 the other related to the issue, linq error relating to
SingleOrDefault in IncludeBaseMappings would throw because of the
multiple mappings created by the bug.
Joy joy line endings
Merge branch 'mrswain-Issue386' into develop
Removing merge files