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