Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 14 Mar 2019 11:32:46 +0000 (20:32 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 14 Mar 2019 11:32:46 +0000 (20:32 +0900)

Trivial merge