Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20160812-tag-2' into staging