Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 4 Feb 2020 13:57:55 +0000 (22:57 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 4 Feb 2020 13:57:55 +0000 (22:57 +0900)

Trivial merge