Merge branch 'release/6.7.0' into devel
Merge branch 'hotfix/6.7.1' into devel
updated content, Jeff's first commit on new system
Merge branch 'release/6.8.0'