Merge branch 'MDL-47875_master' of https://github.com/crazyserver/moodle