Merge remote-tracking branch 'diffycat/jpopsuki'