Reintegration of F#3.1 changes