Merge branch 'master' of https://github.com/google/flatbuffers
authorWouter van Oortmerssen <aardappel@gmail.com>
Mon, 9 Jan 2017 23:55:18 +0000 (15:55 -0800)
committerWouter van Oortmerssen <aardappel@gmail.com>
Mon, 9 Jan 2017 23:55:18 +0000 (15:55 -0800)

Trivial merge