Manual merge of Wikia changes