Merge pull request #8342 from grundman:patch-1
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 3 Apr 2017 09:34:53 +0000 (09:34 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 3 Apr 2017 09:34:53 +0000 (09:34 +0000)

Trivial merge