Merge pull request #3059 from marcwebbie/gorillavid