Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 10 Jan 2017 10:55:33 +0000 (19:55 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 10 Jan 2017 10:55:33 +0000 (19:55 +0900)

Trivial merge