Merge branch 'MDL-59246-master' of git://github.com/jleyva/moodle