Merge pull request #1066 from esdrubal/bug19313