Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 30 Nov 2020 15:41:06 +0000 (00:41 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 30 Nov 2020 15:41:06 +0000 (00:41 +0900)

Trivial merge