Merge the build system changes

The updated build system should already be used in the stable branch.