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