Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 27 Dec 2016 11:15:05 +0000 (20:15 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 27 Dec 2016 11:15:05 +0000 (20:15 +0900)

Trivial merge