Merge "Fix hard-coded fencepost value."