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

Trivial merge