Fix #299
Merge branch 'master' into fsharp_31_tihan2