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