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