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