Merge pull request #3441 from matrixik/patch-1