Merge branch 'upstream'
[routino] / web / www / routino / icons / marker-1-grey.png
web/www/routino/icons/marker-1-grey.png