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

Trivial merge