Merge branch 'w05_MDL-26046_20_noemailever' of git://github.com/skodak/moodle