Merge pull request #1022 from annando/nominatim