Merge pull request #2819 from alarcher/graphite2-139