Merge remote-tracking branch 'upstream/master' into unused-vars

Conflicts:
	src/widgets/StatusBar.js