Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 6 Feb 2017 17:08:02 +0000 (02:08 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 6 Feb 2017 17:08:02 +0000 (02:08 +0900)

Trivial merge