Code

Merge pull request #1809 from beorn-/write_http_kairosdb_format_master