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