fixing wikipedia .. but temporarily
Merge branch 'wmapi'