Merge branch 'upstream/develop'

Conflicts:
	RockWeb/Bin/.gitignore
	packages/repositories.config