Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 27 Feb 2017 15:21:36 +0000 (00:21 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 27 Feb 2017 15:21:36 +0000 (00:21 +0900)

Trivial merge