Merging Shallow Water Response L2 Error bug fix into master branch.