Merge branch 'master' into develop

Conflicts:
	[source]/GlobalAssemblyInfo.cs