2.0.0-rc
Merge branch '2.0.0'