merged in latest from wikirate