Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 24 Dec 2020 15:17:03 +0000 (00:17 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 24 Dec 2020 15:17:03 +0000 (00:17 +0900)

Trivial merge