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