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