Wikimedia subspp

Changes made as requested. I'm not sure why Github is claiming that these can't be merged automatically, and I'm a bit hopeless with Git, so perhaps you could work out what the problem is, and commit?