Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 22 Mar 2021 21:55:32 +0000 (06:55 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 22 Mar 2021 21:55:32 +0000 (06:55 +0900)

Trivial merge