Merge branch 'pachi-10-satsugen'