Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 19 Dec 2018 06:39:29 +0000 (15:39 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 19 Dec 2018 06:39:29 +0000 (15:39 +0900)

Trivial merge