Merge pull request #1006 from Diapolo/tr-tray