Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 29 Jun 2018 02:47:25 +0000 (11:47 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 29 Jun 2018 02:47:25 +0000 (11:47 +0900)

Trivial merge