Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 2 Apr 2019 03:25:45 +0000 (12:25 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 2 Apr 2019 03:25:45 +0000 (12:25 +0900)

Trivial merge