Merge remote-tracking branch 'original/master'

Conflicts:
	bigquery/client.py