Merge branch 'w12_MDL-32050_m23_minify' of git://github.com/skodak/moodle