Organization with failed address geocoding is saved now

Like prev pull request, but with latest upstream/master and preserver commit history.