Merge branch 'w13_MDL-26951_21_archetypes' of git://github.com/skodak/moodle