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