Fix off by one in row removal code
Merge branch 'master' into cutandpaste