Fix broken cross versioning semantics using +
Merge pull request #1498 from sbt/wip/fix-broken-cross

Fix broken cross versioning semantics using +