Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 22 Sep 2018 03:43:56 +0000 (12:43 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 22 Sep 2018 03:43:56 +0000 (12:43 +0900)

Trivial merge