Merge pull request #1082 from esdrubal/bug19287