Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 4 Oct 2018 13:36:20 +0000 (22:36 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 4 Oct 2018 13:36:20 +0000 (22:36 +0900)

Trivial merge