Merge branch 'MDL-69360-master' of git://github.com/NoelDeMartin/moodle