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