Typo
Merge branch 'master' into oauth-flow

Conflicts:
	lib/provider-dropbox/handlers/init.js