Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 10 Dec 2020 02:28:31 +0000 (11:28 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 10 Dec 2020 02:28:31 +0000 (11:28 +0900)

Trivial merge