Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 10 Jun 2019 01:31:31 +0000 (10:31 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 10 Jun 2019 01:31:31 +0000 (10:31 +0900)

Trivial merge