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