Merge pull request #919 from rouault/reformat