Merge pull request #1774 from nnnick/fix/1762

Handle tension being set to 0 properly