Merge pull request #9828 from berak:fix_c++17_9572
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 11 Oct 2017 13:31:17 +0000 (13:31 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 11 Oct 2017 13:31:18 +0000 (13:31 +0000)

Trivial merge