Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 5 Feb 2018 16:39:02 +0000 (01:39 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 5 Feb 2018 16:39:02 +0000 (01:39 +0900)

Trivial merge