Test commit for Portable Git
Merge branch 'master' into swerveClass