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