Merge branch 'MDL-66115_master' of https://github.com/dvdcastro/moodle