Merge branch 'MDL-52821-master' of https://github.com/xow/moodle