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