Merge pull request #3258 from hamogu/patch-1