Merge branch 'master' into extract
extract more things from wiki.go
merge extract, resolve conflicts