Merge pull request #8289 from vskarlsruhe:patch-4
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 2 Mar 2017 05:52:05 +0000 (05:52 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 2 Mar 2017 05:52:05 +0000 (05:52 +0000)

Trivial merge