Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 6 Sep 2018 06:34:41 +0000 (15:34 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 6 Sep 2018 06:34:41 +0000 (15:34 +0900)

Trivial merge