Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 13 Sep 2021 13:13:30 +0000 (22:13 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 13 Sep 2021 13:13:30 +0000 (22:13 +0900)

Trivial merge