Update style.css
Merge branch 'master' into rel-0.3.x