Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 11 Aug 2017 06:28:01 +0000 (15:28 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 11 Aug 2017 06:28:01 +0000 (15:28 +0900)

Trivial merge