Commits

Dana Robinson committed cb79a1fd86b
[svn-r28505] Merge of r28497 and 28499 from the trunk. Fixes a race condition in the build phase by separating the static and shared build directories. Tested on: Windows 10 Pro w/ VS 2015 Pro and CMake 3.3.1.