Merge branch 'dev'
Make modernizr check scss as well as css