Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 11 Jan 2017 08:07:22 +0000 (17:07 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 11 Jan 2017 08:07:22 +0000 (17:07 +0900)

Trivial merge