Knocking out two birds with one import

https://www.openstreetmap.org/user/itsamap!/diary/152909