Merge branch 'master-upstream'

Conflicts:
	.meteor/packages