Merge branch 'master' of github.com:google/flatbuffers
authorRomain Gilles <rgilles@github>
Tue, 5 Jul 2016 09:40:33 +0000 (11:40 +0200)
committerRomain Gilles <rgilles@github>
Tue, 5 Jul 2016 09:40:33 +0000 (11:40 +0200)

Trivial merge