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