Wiki module works
Merge branch 'wikipedia'