Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 29 Oct 2018 11:18:56 +0000 (20:18 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 29 Oct 2018 11:18:56 +0000 (20:18 +0900)

Trivial merge