Merge remote-tracking branch 'sstabellini/tags/xen-20170516-tag' into staging