Adding AssemblyBindingRedirect
Merge branch 'master' into develop

Conflicts:
	lib/fsi/Fsi.exe.config