Merge pull request #4323 from persandstrom/master