css parsing bugfix
Merge branch 'master' into torquew