Merge pull request #1072 from esdrubal/bug19862