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