Merge remote branch 'upstream/master' into postgres-collector

Conflicts:
	src/collectors/postgres/postgres.py
Prevent division by zero in CacheHitRate
Merge branch 'postgres-collector'

Conflicts:
	src/collectors/postgres/postgres.py