Instantiate Primitive template only if compiling on Windows
Merge remote-tracking branch 'uboot/master'
Add root directory to include paths