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