Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 7 May 2018 05:38:38 +0000 (14:38 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 7 May 2018 05:38:38 +0000 (14:38 +0900)

Trivial merge