Finishing the removal of scoped from style blocks started in pr#1577
Merge branch 'dev-master' into dev-3.x