Merge branch 'MDL-70067-310_theme_classic' of https://github.com/alexmorrisnz/moodle...