Merge pull request #12600 from tschuettler/293-geocoding