Merged build system improvements.