Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 14 Jun 2019 06:38:49 +0000 (15:38 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 14 Jun 2019 06:38:49 +0000 (15:38 +0900)

Trivial merge