apnic master merged into branch