Merge branch 'upstream'
[routino] / icons / marker-5-red.png
icons/marker-5-red.png