4670
Merge branch 'ripe-atlas-fw-4670'

Conflicts:
	eperd/eooqd.c
	eperd/eperd.c
	networking/rptaddrs.c:int