Merge branch 'trivial/style' into protobuf_noprotobufs
Temp backup commit, don't be pulling this stuff