Merged build system improvements from TripleGit