merge github/stable into gerrit/stable

This is an automatically-generated request to pull stable into
gerrit/stable.