Merge pull request #3639 from kholk/master