Merge pull request #3975 from persandstrom/master
authorHannu Nyman <hannu.nyman@iki.fi>
Sat, 11 Feb 2017 12:56:16 +0000 (14:56 +0200)
committerGitHub <noreply@github.com>
Sat, 11 Feb 2017 12:56:16 +0000 (14:56 +0200)
Protobuf: Upgrade to version 3.1


Trivial merge