Merge pull request #8437 from matrush:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 23 Mar 2017 12:47:54 +0000 (12:47 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 23 Mar 2017 12:47:54 +0000 (12:47 +0000)

Trivial merge