Merge pull request #4892 from fededim/master