swift

e5164bdf - Merge pull request #8806 from gottesmm/small_gardening_fixes