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

Trivial merge