Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 11 Jan 2021 07:51:04 +0000 (16:51 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 11 Jan 2021 07:51:04 +0000 (16:51 +0900)

Trivial merge