Merge pull request #1767 from WalterBright/scanomf