Merge branch 'w04_MDL-26008_20_creator' of git://github.com/skodak/moodle