Merge branch 'MDL-39947' of https://github.com/aolley/moodle