Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 22 Jan 2020 05:29:10 +0000 (14:29 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 22 Jan 2020 05:29:10 +0000 (14:29 +0900)

Trivial merge