Don't use CSS imports. Closes #2610
Merge branch 'master' into gh-pages