Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 1 Oct 2018 10:23:42 +0000 (19:23 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 1 Oct 2018 10:23:42 +0000 (19:23 +0900)

Trivial merge