Catch up v2.1-dev to recent changes.

Takes all changes that went in v2.0.2-dev (via the newly create v2.0.3-dev) and merge them into v2.1-dev.