Merge branch 'MDL-54576_themeSelector' of https://github.com/mrmark/moodle