Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 16 Dec 2020 01:00:07 +0000 (10:00 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 16 Dec 2020 01:00:07 +0000 (10:00 +0900)

Trivial merge