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

Trivial merge