Merge branch 'trunk' into google_storage_object_size_fix