Merge pull request #8364 from csukuangfj:patch-2
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 22 Mar 2017 14:13:13 +0000 (14:13 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 22 Mar 2017 14:13:13 +0000 (14:13 +0000)

Trivial merge