Bybye newrelic
Merge branch 'master' into new-provider

Conflicts:
	package.json