Merge pull request #8557 from grundman:patch-3
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 3 May 2017 12:12:59 +0000 (12:12 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 3 May 2017 12:12:59 +0000 (12:12 +0000)

Trivial merge