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