Merge branch 'split-out-org-faces.el'