Merge branch 'w46_MDL-36457_m24_jsmin' of git://github.com/skodak/moodle