Merge remote-tracking branch 'remotes/berrange/tags/pull-build-2017-11-07-1' into...