Merge commit '360ded3c07d7577f85db8e976a34a8825fa467ef'
Merge commit 'c6d4f2bf637bfd3bbe4f8d7404c28031e6265df9'
Merge commit '3b73edfdfc10fb21fe8dd98685c2ba8147d29737'
Merge commit '6f5f591553f8f18017959b7779837946679c4079'
Update python client
fix a typo
Merge branch 'master' of github.com:youtube/vitess
Merge commit 'cf1b5df03d2d28f2ea340af8b9beccdb0d56de8e'
Merge branch 'master' into replication