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