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