Merge downstream at well-defined points, fixes #77