Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 16 Nov 2020 08:07:07 +0000 (17:07 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 16 Nov 2020 08:07:07 +0000 (17:07 +0900)

Trivial merge