Merge branch '2.1.x' into 2.2.x

Closes gh-19657
This commit is contained in:
Andy Wilkinson
2020-01-12 10:42:42 +00:00