merge branch master into wikirate