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