Merge pull request #3975 from persandstrom/master