Async Metrics
Merge branch 'master' into dev

Conflicts:
	plugin.yml