Merge branch 'bug_274_disable_fast_winding_for_non_ts'