Incorporated changes from FSharp.ProjectScaffold.