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