Merge pull request #4225 from Faduf/master