Merge branch 'master' into solarized-default