Sync solarized-emacs with upstream