Clarification of channel.h license
Merge branch 'master' into devel