for real now
Merge branch 'classic' into gh-pages