Merge branch 'MDL-28949d' of git://github.com/srynot4sale/moodle