Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 19 Feb 2019 10:42:21 +0000 (19:42 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 19 Feb 2019 10:42:21 +0000 (19:42 +0900)

Trivial merge