Merge remote-tracking branch 'origin/master' into 1.2

3 jobs for 1.2-keep-autogenerated-protobuf-c
in 9 minutes and 38 seconds and was queued for 1 second