Merge branch 'master' into branch-1.5
[fw/altos] / icon / application-vnd.altusmetrum.micropeak.svg
icon/application-vnd.altusmetrum.micropeak.svg