Merge branch 'master' into import-wcf
authorAtsushi Eno <atsushieno@gmail.com>
Fri, 24 Apr 2015 06:08:18 +0000 (15:08 +0900)
committerAtsushi Eno <atsushieno@gmail.com>
Fri, 24 Apr 2015 06:08:18 +0000 (15:08 +0900)

Trivial merge