Merge pull request #1178 from ahomatthew/develop

Fix for new row in tol table.