Merge Dave Howell's and Adrian Schuur's modifications.
52 files changed