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