Merge pull request #132 from prometheus/repo_sync

Synchronize common files from prometheus/prometheus