Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 28 Apr 2019 14:35:14 +0000 (23:35 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sun, 28 Apr 2019 14:35:14 +0000 (23:35 +0900)

Trivial merge