Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 3 Feb 2020 17:01:09 +0000 (02:01 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 3 Feb 2020 17:01:09 +0000 (02:01 +0900)

Trivial merge