Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 20 Jun 2019 18:55:45 +0000 (03:55 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 20 Jun 2019 18:55:45 +0000 (03:55 +0900)

Trivial merge