Merge pull request #5163 from colemanw/cssFix