Merge branch 'off-by-one-twice'