don't merge css in conditinal comment
Merge branch 'l10n'