Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 30 Mar 2019 19:27:28 +0000 (04:27 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 30 Mar 2019 19:27:28 +0000 (04:27 +0900)

Trivial merge