Merge branch 'MDL-26250-final6' of github.com:mouneyrac/moodle