More work to enable Sass compatibility.
Merge branch 'awood-more-sass-compat'