Merge branch 'MDL-49005-master' of https://github.com/abias/moodle