Merge branch 'MDL-73390-master' of https://github.com/bmbrands/moodle