Merge branch 'w05_MDL-26172_20_groupupgrade' of git://github.com/skodak/moodle