Merge pull request #11164 from corleypc:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 27 Mar 2018 10:04:20 +0000 (10:04 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 27 Mar 2018 10:04:20 +0000 (10:04 +0000)

Trivial merge