Merge branch 'MDL57475-master' of https://github.com/mmafrar/moodle