Merge upstream master.

Resolve conflict on gcloud/datastore/test_transaction.py.