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