merge github/master into gerrit/master

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