Merge remote-tracking branch 'upstream/ChocoButter' into ChocoButter
Merge remote-tracking branch 'upstream/ChocoButter' into ChocoButter
Merge remote-tracking branch 'upstream/ChocoButter' into ChocoButter
Update test case
Merge remote-tracking branch 'upstream/ChocoButter' into ChocoButter
Merge pull request #783 from ke-yu/ChocoButter

Update a test case