Merge branch 'ntrel/make-win-doc'