version 2.4.1.2, 2.5.0.2, 2.6.1.2
Merge branch 'master' into protobuf_261