Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 19 Jun 2019 13:52:34 +0000 (22:52 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 19 Jun 2019 13:52:34 +0000 (22:52 +0900)

Trivial merge