Merge remote-tracking branch 'diffycat/master'