Fix #1537 - Long click to directly edit waypoint
Merge pull request #2856 from campbeb/fix1537

Fix #1537 - Long click to directly edit waypoint