Merge branch 'MDL-23016c' of git://github.com/srynot4sale/moodle