Merge branch 'w05_MDL-26196_20_tags' of git://github.com/skodak/moodle