Fix nodeValue deprecation warnings
Add amenity=bus_station preset (fixes #2298)
Merge pull request #2296 from bhousel/master

Support option strings for combo fields