Versioned for 2.1.0.RC2
Merge branch 'master' into next

* master:
  Versioned for 2.1.0.RC2