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