Merge branch 'version-fix-5.4.1' of github.com:joeworkman/foundation into joeworkman-version-fix-5.4.1