Sync with internal changes.
Merge pull request #1 from librato/feature/v10.15

Sync with internal changes.