channel update
Merge branch 'master' of https://github.com/wesselsga/reno