Merge branch 'develop' of github.com:fsharp/FAKE into develop

Conflicts:
	src/app/FakeLib/ReleaseNotesHelper.fs