Merge remote-tracking branch 'remotes/berrange/tags/socket-next-pull-request' into...