Merge branch 'master' into branch-1.6
[fw/altos] / icon / grayon.png
icon/grayon.png