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