Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 18 Mar 2019 06:38:18 +0000 (15:38 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 18 Mar 2019 06:38:18 +0000 (15:38 +0900)

Trivial merge