Merge branch 'MDL-68844-master' of https://github.com/roland04/moodle