Bugfix #0000270
Merge branch 'master' into responsive-wip