Merge branch 'w13_MDL-26913_20_sitecreated' of git://github.com/skodak/moodle