Merging work from our jacson branch with George's modifications.
Quick fix for a minor merge hiccup.