Merge pull request #1536 from esdrubal/noreuse