Merge branch 'upstream'
[routino] / icons / marker-6-grey.png
icons/marker-6-grey.png