Fixing the subtree merge; it didn't seem to get committed or pushed up.