Merge branch '0.x-kyoma'