Merge pull request #9746 from alalek:fix_msvs2017_warning
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 2 Oct 2017 11:15:48 +0000 (11:15 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 2 Oct 2017 11:15:48 +0000 (11:15 +0000)

Trivial merge