Merge branch 'upstream'
[routino] / icons / waypoint-remove.png
icons/waypoint-remove.png