Merge pull request #896 from totten/httpclient-test