Forward Port - PR #21

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