Merged build system improvements from NiallsCPP11Utilities
More merging of build system scripts.