Merge remote-tracking branch 'origin/master' into remove_keys

Conflicts:
	lib/Utilities.js