Merge pull request #8796 from liurs1990:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 26 May 2017 12:04:56 +0000 (12:04 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 26 May 2017 12:04:56 +0000 (12:04 +0000)

Trivial merge