Merge "Fix makefile to build on a Windows host PC" into integration