Merge branch 'MDL-29190_master_wip' of git://github.com/grabs/moodle