Fixes #12748
Merge branch 'master' into typography-example-updates

Conflicts:
	docs/assets/js/customize.min.js