Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 7 Sep 2020 13:35:04 +0000 (22:35 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 7 Sep 2020 13:35:04 +0000 (22:35 +0900)

Trivial merge