Merge pull request #4899 from fededim/master