Merge of Dave's changes.
10 files changed