Merge "WikiPage: Make prepareContentForEdit method not accept an integer"