Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 17 Aug 2018 21:13:24 +0000 (06:13 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 17 Aug 2018 21:13:24 +0000 (06:13 +0900)

Trivial merge