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