Brought the old branch merge up to speed with Greg's information.
Merge branch 'master' into oldbranch