Better showing/hiding of tray
Merge branch 'master' into squares