Merge pull request #2399 from alexanderkyte/seq_point_nostop