Merge pull request #412 from carryel/master

Fixed infinite loop of MultipartBodyTest for master branch.