Merged upstream changes into Solarized submodule