Merging Google Cloud SQL into Master

Merged Google CloudSQL patches into Master.