Merge https://github.com/openstreetmap/potlatch2