Merge branch 'w05_MDL-26189_20_imse' of git://github.com/skodak/moodle