fix narrower, broader, related collection bug in mapper
Merge remote-tracking branch 'origin/master'