Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 6 Dec 2016 18:00:00 +0000 (03:00 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 6 Dec 2016 18:00:00 +0000 (03:00 +0900)

Trivial merge