Merge pull request #10124 from zhongwuzw:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 28 Nov 2017 10:53:00 +0000 (10:53 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 28 Nov 2017 10:53:00 +0000 (10:53 +0000)

Trivial merge