updated to 1.8.1
conflictのため
Merge branch 'master' into 1.8
Merge branch '1.8' into cc-1.8