Merge pull request #1074 from esdrubal/bug18421