Catch up v2.1-dev to recent changes.

Pull changes from v2.0.3-dev into v2.1.