Merge pull request #1 from graphite-project/master

Sync to master