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