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