Partial preparation for 2.0 release
Final commit before v2.0 tag