Merge branch 'upstream'
[routino] / web / www / routino / icons / waypoint-add.png
web/www/routino/icons/waypoint-add.png