Update WikiEditor to master

Change-Id: I75f0d911a1a6439430b12224d8eb6210093d8f8e