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