Part 1 of CSS bugfix by Sinnwerkstatt
Merge branch 'hotfix/v0.36'