Merge branch 'maint-0.3.4'

diff --cc src/rust/protover/protoset.rs
Simple merge

diff --cc src/rust/protover/protover.rs
Simple merge

diff --cc src/rust/protover/tests/protover.rs
Simple merge