Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 28 Apr 2018 08:14:25 +0000 (17:14 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 28 Apr 2018 08:14:25 +0000 (17:14 +0900)

Trivial merge