Added changes from fsprojects/TPCombinators