Trunk / primary again again again

https://www.openstreetmap.org/user/SuborbitalPigeon/diary/458