Merge pull request #1067 from esdrubal/bug19862