Merge branch 'updater'

Conflicts:
	modules/updater/index.js