Merge pull request #8245 from oulenz:patch-1
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 10 Mar 2017 14:30:09 +0000 (14:30 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 10 Mar 2017 14:30:09 +0000 (14:30 +0000)

Trivial merge