Forward Port - PR #29

https://github.com/graphite-project/carbon/pull/29