Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 18 May 2017 12:31:28 +0000 (21:31 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 18 May 2017 12:31:28 +0000 (21:31 +0900)

Trivial merge