Re-activate formatter.
Merge pull request #2538 from jburel/rebased/develop/wiki-format

Wiki format (rebased onto develop)