Merge branch 'w04_MDL-31176_m23_groupcontext' of git://github.com/skodak/moodle