Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2015-12-17' into staging