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