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