Merged in jja/universal-wiki-converter/fix-moinmoin-split (pull request #2)