encoding
Merge remote-tracking branch 'origin/master'

Conflicts:
	wikibot.py
change to encoding in getWiki.py