Merge pull request #9850 from klchang:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 27 Oct 2017 11:22:28 +0000 (11:22 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 27 Oct 2017 11:22:28 +0000 (11:22 +0000)

Trivial merge