Merge branch 'master' into develop

Conflicts:
	src/app/FakeLib/FileHelper.fs