Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 3 Apr 2017 14:40:11 +0000 (23:40 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 3 Apr 2017 14:40:11 +0000 (23:40 +0900)

Trivial merge