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