merge new stuff from black09/master
Merge branch 'channel-osd'