Merge branch 'MDL-53409-master' of git://github.com/crazyserver/moodle