Pr 485 branch copy

@astearns - apparently I've deleted the branch that was PR #485 and we're now unable to merge it.  I created a patch from that PR and created a new branch for it here.  Since you'd already approved PR #485, can you just go head and merge this one?  I'll close that one then.  Thanks & sorry for the confusion.  

(p.s. I'm going to have to re-create a couple more branches corresponding to PRs that I also apparently deleted.)