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