Merge branch 'MDL-62756_master' of https://github.com/miotto/moodle