Merge branch 'MDL-33055_master' of git://github.com/kordan/moodle