Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 11 May 2019 14:42:30 +0000 (23:42 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 11 May 2019 14:42:30 +0000 (23:42 +0900)

Trivial merge