Aさんの修正
Merge branch 'develop' of github.com:toshiromou/GitTest into develop