Merge remote-tracking branch 'remotes/berrange/tags/pull-io-channel-base-2015-12...