Merge remote-tracking branch 'remotes/berrange/tags/pull-io-next-2016-03-15-1' into...