Merge branch 'MDL-59454-master' of https://github.com/lucaboesch/moodle