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