Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2017-11-28-1' into staging