Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 1 Mar 2017 16:17:33 +0000 (01:17 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 1 Mar 2017 16:17:33 +0000 (01:17 +0900)

Trivial merge