Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 17 Jul 2019 10:45:13 +0000 (19:45 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 17 Jul 2019 10:45:13 +0000 (19:45 +0900)

Trivial merge