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