Merge pull request #221 from xithan/wikirate

update wikirate to current develop
isolated migration changes for wikirate update
Merge remote-tracking branch 'upstream/wikirate' into wikirate