If messages A and B have the same oneof case, which is a message
type, and we merge B into A, those sub-messages should be merged.

Fixes #3200.

Note that I haven't regenerated all the code, as some of the protos
have been changed, breaking generation.

update joda-time javadoc url

Note that the default behavior is still to throw an exception; you
need to opt into ignoring unknown fields.

Fixes #2838.

Suppress VS2017 compiler/linker warnings

* Reserve unknown in ruby

* Revert ruby tests. Wait for cpp impl for conformance test

* Add conformance test for preserving unknown

* Add unknown field conformance test to csharp failure list.

* Fix comments

* Fix comment

* Fix comments

* Fix typo

* Use stringsink_string directly

* Mark hd unused

* Remove unused encodeunknown_handlerfunc

Merge 3.4.x into master before cutting 3.5.x

To be clear that we set a new variable

Improves coverage of GPBCodedInputStream

Add brief documentation describing each warning suppression.

[v3.4.x branch] Fix iOS cc_library build for protobuf.

Fix iOS cc_library build for protobuf.

CodedInputStream::SetTotalBytesLimit description fix

fix implicit fallthrough in gcc 7

Integrate google internal changes for the up coming 3.5 release.

fixes issue #3750

Add @Deprecated annotation support for proto file.

Add the proto-lens Haskell library to the 3rd party doc.

protobuf_generate: create include path only for proto files

Clang warning cleanup for unused parameter.

Add GopherJS protobuf and gRPC links

Fix: Truncated Message due to "TypeError: unhashable type: 'bytearray'"

Remove C++11 only usages in io_win32 tests.

Fix undefined memory management found by Clang's sanitizers.