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

Trivial merge