Trunk and primary

https://www.openstreetmap.org/user/Richard/diary/457