compile time improved on MSVC with /MP flag
Merge branch 'master' into chambbj-add-mp-support-for-msvc