Testing PNG tray icons
Merge branch 'master' into pngicons