Merge pull request #1068 from esdrubal/bug18421