Merge branch 'MDL-46238' of git://github.com/shashirepo/moodle