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