Merge pull request #415 from enricosada/bug6373