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