Merge branch 'MDL-70342-master' of git://github.com/abias/moodle