Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 17 Nov 2017 16:30:07 +0000 (01:30 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 17 Nov 2017 16:30:07 +0000 (01:30 +0900)

Trivial merge