Merge pull request #915 from lautr3k/fix/http_upload