継承記述の変更
Merge remote-tracking branch 'origin/edge' into edge