Merge pull request #525 from danvk/this-formatter