Merge branch 'MDL-64071-master' of https://github.com/UniGe/moodle