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