Merged build system changes.