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