Merge pull request #1235 from rouault/imf