Diagonal Rail

Child Pull Request: Only merge if parent is merged.