Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 18 Feb 2019 05:17:23 +0000 (14:17 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 18 Feb 2019 05:17:23 +0000 (14:17 +0900)

Trivial merge