Merge pull request #6339 from cividesk/Fortify_Fixes