Merge remote-tracking branch 'origin/master' into blender2.8

diff --combined make.bat
index ba5832f9524cd1b1f581fc1ca9d38bb463366b5d,988cb5f4c68ea182d5b1c03ef124c2152562a7b1..4abcd086cdfad68dcba3cbc969fd713cd44372ef
--- 1/make.bat
--- 2/make.bat
+++ b/make.bat
@@@ -98,7 -98,7 +98,7 @@@ if NOT "%1" == "" 
        ) else if "%1" == "update" (
                svn up ../lib/*
                git pull --rebase
 -              git submodule foreach git pull --rebase origin master
 +              git submodule update --remote
                goto EOF
        ) else if "%1" == "clean" (
                set MUST_CLEAN=1
@@@ -257,7 -257,7 +257,7 @@@ echo msbuild 
        %BUILD_DIR%\Blender.sln ^
        /target:build ^
        /property:Configuration=%BUILD_TYPE% ^
-       /maxcpucount ^
+       /maxcpucount:2 ^
        /verbosity:minimal ^
        /p:platform=%MSBUILD_PLATFORM% ^
        /flp:Summary;Verbosity=minimal;LogFile=%BUILD_DIR%\Build.log >> %BUILD_DIR%\rebuild.cmd
@@@ -273,7 -273,7 +273,7 @@@ msbuild 
        %BUILD_DIR%\Blender.sln ^
        /target:build ^
        /property:Configuration=%BUILD_TYPE% ^
-       /maxcpucount ^
+       /maxcpucount:2 ^
        /verbosity:minimal ^
        /p:platform=%MSBUILD_PLATFORM% ^
        /flp:Summary;Verbosity=minimal;LogFile=%BUILD_DIR%\Build.log