Merge branch 'w07_MDL-26452_20_resmess' of git://github.com/skodak/moodle