Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 2 Jul 2020 04:28:48 +0000 (13:28 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 2 Jul 2020 04:28:48 +0000 (13:28 +0900)

Trivial merge