Which kind of requires style to be loaded.
Merge branch 'master' into gh-pages