Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 23 Oct 2020 15:47:37 +0000 (00:47 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 23 Oct 2020 15:47:37 +0000 (00:47 +0900)

Trivial merge