Merge branch 'MDL-51978-master' of https://github.com/jtc/moodle