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