Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 23 Jun 2020 05:54:24 +0000 (14:54 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 23 Jun 2020 05:54:24 +0000 (14:54 +0900)

Trivial merge