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