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