trunk/primary again

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