FIX: Typo in var name
Merge branch 'master' into feature/instance-config

Conflicts:
	lib/dispatcher.js