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