Merge pull request #2212 from wpaulino/off-by-one-locktime