Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 28 Feb 2017 09:05:31 +0000 (18:05 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 28 Feb 2017 09:05:31 +0000 (18:05 +0900)

Trivial merge