Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 16 Mar 2019 04:40:33 +0000 (13:40 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 16 Mar 2019 04:40:33 +0000 (13:40 +0900)

Trivial merge