Fixed merge error
Merge branch 'master' of github.com:fsharp/fsharpx
Merge branch 'master' of github.com:fsharp/fsharpx