Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 7 Feb 2019 11:21:33 +0000 (20:21 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 7 Feb 2019 11:21:33 +0000 (20:21 +0900)

Trivial merge