Squashed 'emacs/' content from commit 0bba323

git-subtree-dir: emacs
git-subtree-split: 0bba3233fe1fbe2997c0dbdff4112df7076c5174
Merge commit 'b0254a2256ea7ce8aae4d24237fb5916a78fac42' as 'emacs'