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