Merge branch 'MDL-50749-master' of https://github.com/mackensen/moodle