Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 3 Jun 2017 12:05:23 +0000 (21:05 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 3 Jun 2017 12:05:23 +0000 (21:05 +0900)

Trivial merge