Merge pull request #1069 from esdrubal/bug16990