Merge remote-tracking branch 'dechamps/wintapver' into 1.1