Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 16 Jun 2020 22:53:07 +0000 (07:53 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 16 Jun 2020 22:53:07 +0000 (07:53 +0900)

Trivial merge