Merge branch 'MDL-33398b' of git://github.com/srynot4sale/moodle