Merge branch 'MDL-42869' of https://github.com/danielneis/moodle