Merge branch 'MDL-3782_multichoice_multiple' of git://github.com/davosmith/moodle