Juggle versions to make everyone happy
Merge pull request #1477 from jean/2.0.x

Juggle versions to make everyone happy