Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 24 Feb 2017 16:09:14 +0000 (01:09 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 24 Feb 2017 16:09:14 +0000 (01:09 +0900)

Trivial merge