Merge branch 'MDL-27827_head' of git://github.com/grabs/moodle