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