Merge branch 'patch-7' of https://github.com/gjones2/Freeside (#13854 as this bug...