Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2016-05-12' into staging