Fixed pos-over-poly case for finding nearest polygon
Merge remote-tracking branch 'upstream/master'