Merge branch 'MDL-38052_master' of git://github.com/kordan/moodle