Merge pull request #12708 from ldevulder:protobuf-fix-compilation-issue-on-s390
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 1 Oct 2018 13:32:29 +0000 (13:32 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 1 Oct 2018 13:32:29 +0000 (13:32 +0000)

Trivial merge