Merge pull request #1081 from rneatherway/bug17537