Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 2 Oct 2019 07:38:13 +0000 (16:38 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 2 Oct 2019 07:38:13 +0000 (16:38 +0900)

Trivial merge