Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master' after updating gould
clean gould relative position map code
Merge pull request #45 from iandjakman/gould-relative-position-map-fix

Gould relative position map fix