Catch up v2.1-dev to v2.0.2-dev

Taking all commits from 2.0.2 and merging them into 2.1.