Merge branch 'MDL-47474' of https://github.com/bostelm/moodle