Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 24 Apr 2018 13:06:28 +0000 (22:06 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 24 Apr 2018 13:06:28 +0000 (22:06 +0900)

Trivial merge