Trunk and primary

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