Merge pull request #3865 from diffycat/jpopsuki