Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 16 Feb 2017 07:18:37 +0000 (16:18 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 16 Feb 2017 07:18:37 +0000 (16:18 +0900)

Trivial merge