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