Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-01-16' into staging