Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 28 Nov 2018 10:48:54 +0000 (19:48 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 28 Nov 2018 10:48:54 +0000 (19:48 +0900)

Trivial merge