V2.0.0

Merge 2.0.0 into master; master is now at 2.0.0.