Merge pull request #7295 from lupustr3:pvlasov/vs11_compat_fix
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 16 Sep 2016 13:20:08 +0000 (13:20 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 16 Sep 2016 13:20:08 +0000 (13:20 +0000)

Trivial merge