Merge pull request #3470 from untoldone/master