Merge branch 'MDL-50529_dupe' of git://github.com/andyjdavis/moodle