Merge branch 'MDL-52365_new' of git://github.com/mkassaei/moodle