Merging the 2.0.x branch into master

Changes from the 2.0.x branch merged into master.