Merge branch 'w23_MDL-33555_m23_assignfk' of git://github.com/skodak/moodle