Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 17 May 2018 11:34:20 +0000 (20:34 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 17 May 2018 11:34:20 +0000 (20:34 +0900)

Trivial merge