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