Merge pull request #3125 from skob/master