Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/OpenCPN/OpenCPN
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master' into overzoom
First attempt at individual waypoint arrival distances
Merge pull request #194 from jongough/waypoint-arrival

Waypoint arrival