upstream/0.0_git20181014

Shengjing Zhu

@zhsj

e1ecd04f · Merge pull request #942 from zhsj/fix-gmock · Oct 14, 2018

Upstream version 0.0~git20181014