Merge branch 'MDL-65335_master' of https://github.com/marxjohnson/moodle