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