Merge branch 'w33_MDL-28929_m22_themeplaceholders' of git://github.com/skodak/moodle