wheatgrass theme customization
Merge remote-tracking branch 'github/emacs' into emacs
Merge remote-tracking branch 'github/emacs' into emacs
Merge conflicts resolved.