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

Trivial merge