Merge pull request #1143 from stweil/format