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