Better signature for formatter.
Merge branch 'master' into fedKit