Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 10 Nov 2017 06:18:13 +0000 (15:18 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 10 Nov 2017 06:18:13 +0000 (15:18 +0900)

Trivial merge