Manual merge of Pull Request #204 by @ChALkeR (Cleanup OpenLayers geocoder)