info instead of error
Merge branch 'master' of https://github.com/NodeBB/NodeBB

Conflicts:
	src/upgrade.js