Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 19 Oct 2020 14:23:14 +0000 (23:23 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 19 Oct 2020 14:23:14 +0000 (23:23 +0900)

Trivial merge