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

Trivial merge