Bump to 2.0.1 for the compatibilty fix.
Merge branch '2.0-stable'