Merge branch 'w33_MDL-29020_m22_clidbenrol' of git://github.com/skodak/moodle