Merge conflict with style.css, kept upstream.