Merge branch 'MDL-60070-master' of git://github.com/lameze/moodle