Merge branch 'master' into single-inheritance.
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 20 May 2017 17:27:38 +0000 (02:27 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 20 May 2017 17:27:38 +0000 (02:27 +0900)

Trivial merge