Merge branch 'wip_MDL-47303_m28_jquery' of https://github.com/skodak/moodle