Merge pull request #2421 from tsondergaard/3.1.x

Export fixed_address_empty_string