Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 12 Mar 2019 11:24:22 +0000 (20:24 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 12 Mar 2019 11:24:22 +0000 (20:24 +0900)

Trivial merge