Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 4 May 2019 06:57:37 +0000 (15:57 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 4 May 2019 06:57:37 +0000 (15:57 +0900)

Trivial merge