Merge pull request #1063 from esdrubal/bug18482