Merge in commits from Singularity