Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2017-01-23-2' into staging