upstream/0.0_git20190124

Shengjing Zhu

@zhsj-guest

bb97f3ac · Merge pull request #1035 from dacrhu/master · Jan 24, 2019

Upstream snapshot 0.0~git20190124