3.6.x same as master

With a bunch of empty commits mentioning the SHAs of commits squash-merged together with other commits.