[BUGFIX beta] Put SafeString in the right place.
Merge pull request #9962 from rwjblue/fix-safe-string-export

[BUGFIX beta] Put SafeString in the right place.