Merge: a9fd6be01f9d 6e8161bb3019

Merge remote-tracking branch 'google/master' into base

Conflicts:
python/src/README

Revision created by MOE tool push_codebase.

R=jlucena
DELTA=5 (5 added, 0 deleted, 0 changed)

Revision created by MOE tool push_codebase.
MOE_MIGRATION=7200