Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 1 Apr 2019 17:10:03 +0000 (02:10 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 1 Apr 2019 17:10:03 +0000 (02:10 +0900)

Trivial merge