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