Sorry, very big commit, 2 days on a Windows box without git nor internet...