Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 24 Oct 2020 08:46:29 +0000 (17:46 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 24 Oct 2020 08:46:29 +0000 (17:46 +0900)

Trivial merge