Merged with upstream

I merged the master branch to the latest revision on google/flatbuffers.