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