(cherry picked from commit 3d75eb66d7)
3d75eb66d7
This encompasses a number of changes to the build process.