Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 17 Mar 2018 16:25:59 +0000 (01:25 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 17 Mar 2018 16:25:59 +0000 (01:25 +0900)

Trivial merge