Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 21 Mar 2017 07:27:31 +0000 (16:27 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 21 Mar 2017 07:27:31 +0000 (16:27 +0900)

Trivial merge