Merge branch 'w04_MDL-26066_20_dbenrol' of git://github.com/skodak/moodle