Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2016-10-27-1' into staging