Merge branch 'master' into develop
acceptArrayオプションに対応
Merge branch 'develop'