Merge pull request #3299 from fededim/master