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