Merge branch 'MDL-44330' of git://github.com/NeillM/moodle