Merge pull request #9582 from sovrasov:fix_gcc7_macro_warning
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 8 Sep 2017 13:31:27 +0000 (13:31 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 8 Sep 2017 13:31:27 +0000 (13:31 +0000)

Trivial merge