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