Merge branch 'kogakure:master' into git.m6w6.name