Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 28 Apr 2018 07:04:24 +0000 (16:04 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 28 Apr 2018 07:04:24 +0000 (16:04 +0900)

Trivial merge