Merge branch 'MDL-72246-master-2' of https://github.com/andrewnicols/moodle