Merge branch 'MDL-68737_master' of https://github.com/t-schroeder/moodle