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