Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 3 Dec 2020 10:15:34 +0000 (19:15 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 3 Dec 2020 10:15:34 +0000 (19:15 +0900)

Trivial merge