Merge branch 'devel'
Fixed ChangeLog.
Fix for channel list.
Merge branch 'master' into devel