Merge remote-tracking branch 'remotes/armbru/tags/pull-ivshmem-2015-11-25' into staging