trunk/primary again

https://www.openstreetmap.org/user/morwen/diary/439