Add last cherry pick from solarized-emacs