Merge pull request #3289 from Reventl0v/patch-1