Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 22 May 2019 03:28:10 +0000 (12:28 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 22 May 2019 03:28:10 +0000 (12:28 +0900)

Trivial merge