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