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