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