refs #6485. Wikimaker changes.