Merge "Various WikiPage code cleanups"