fixes #473, resolves some cross-version conflicts because of branch switching