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