Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 6 Jan 2020 10:47:39 +0000 (19:47 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 6 Jan 2020 10:47:39 +0000 (19:47 +0900)

Trivial merge