Merge branch 'w04_MDL-26096_20_catenrol' of git://github.com/skodak/moodle