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